Quick Reference

Merge Button symbols
The following table describes the symbols found on the Merge button.
(In the table,

HEAD refers to the latest version of a file as maintained by your version control tool, and INIT refers to the initial version of the file.)

Merge button symbol | Description
= | The changes are the same in both versions. There is no need to merge anything.
? | Here is a conflict. The same lines in both versions have been changed.
< | The version in the right column has changed. The version in the left column has not changed. If you click on it, the version in the left column is restored.
: | The version in the left column has changed. The version in the right column has not changed. If you click on it, the version in the right column is restored (normally you don't want this since you will restore the original).
! | If the left most file is not writable or if you look at a difference between versions in the repository, ! is the read only version of <. This means that clicking on the button has no effect.
# | If the left most file is not writable or if you look at a difference between versions in the repository, # is the read only version of ?. This means that clicking on the button has no effect.

Symbol background color
In addition, the following background colors have been added to emphasize the above.

Symbol background color | Description
red | CAUTION: Here is a conflict!
green | It is advisable to click on the merge button.
black | No need to merge anything.